home *** CD-ROM | disk | FTP | other *** search
/ Internet Info 1994 March / Internet Info CD-ROM (Walnut Creek) (March 1994).iso / networking / info-service / gopher / incoming / gopher.query.patch < prev    next >
Encoding:
Text File  |  1992-07-19  |  10.2 KB  |  359 lines
  1. Common subdirectories: gopher1.01/doc and gopher1.01.q/doc
  2. Common subdirectories: gopher1.01/examples and gopher1.01.q/examples
  3. Common subdirectories: gopher1.01/gopher and gopher1.01.q/gopher
  4. Common subdirectories: gopher1.01/gopherd and gopher1.01.q/gopherd
  5. Common subdirectories: gopher1.01/mindexd and gopher1.01.q/mindexd
  6. Common subdirectories: gopher1.01/misc and gopher1.01.q/misc
  7. Common subdirectories: gopher1.01/object and gopher1.01.q/object
  8. Common subdirectories: gopher1.01/examples/.cap and gopher1.01.q/examples/.cap
  9. Common subdirectories: gopher1.01/examples/Sample Directory and gopher1.01.q/examples/Sample Directory
  10. Common subdirectories: gopher1.01/examples/Sample Directory/.cap and gopher1.01.q/examples/Sample Directory/.cap
  11. Common subdirectories: gopher1.01/examples/Sample Directory/wais-index and gopher1.01.q/examples/Sample Directory/wais-index
  12. diff -cr gopher1.01/gopher/gopher.c gopher1.01.q/gopher/gopher.c
  13. *** gopher1.01/gopher/gopher.c    Mon Jun 22 09:17:30 1992
  14. --- gopher1.01.q/gopher/gopher.c    Mon Jul 20 11:57:47 1992
  15. ***************
  16. *** 10,15 ****
  17. --- 10,76 ----
  18.   #include <sys/file.h>
  19.   void describe_gopher();
  20.   
  21. + #define MAX_PROMPTS 12
  22. + 
  23. + void do_query(InGopher,ZeGopher)
  24. + GopherStruct *InGopher,*ZeGopher;
  25. + {
  26. +    char *Option[MAX_PROMPTS];
  27. +    int i;
  28. +    char Response[MAX_PROMPTS][MAXSTR];
  29. +    char sErrMsg[MAXSTR];          /* Error line on screen */
  30. +    int NumPrompts;
  31. +    char ReturnType;
  32. +    char *p;
  33. +    char selector[1024];
  34. +    char return_selector[1024];
  35. + 
  36. +    GScpy(ZeGopher,InGopher);
  37. + 
  38. +    for(i=0; i<MAX_PROMPTS;i++) Response[i][0]='\0';
  39. +    sErrMsg[0]='\0';
  40. +    strcpy(selector,GSgetPath(ZeGopher));
  41. +    p=strtok(selector,"|");
  42. +    if (!p) return;
  43. +    ReturnType= *p;
  44. +    p=strtok(NULL,"|");
  45. +    if (!p) return;
  46. +    NumPrompts=atoi(p);
  47. +    i=0;
  48. +    while(i<NumPrompts) {
  49. +        p=strtok(NULL,"|");
  50. +        Option[i]=p;
  51. +        i++;
  52. +    }
  53. +    Option[i]='\0';
  54. +    p=strtok(NULL,"|"); /* p now equals selector (if any) */
  55. + 
  56. +    if (p!=NULL) {
  57. +       strcpy(return_selector,p);
  58. +    } else {
  59. +        return_selector[0]='\0';
  60. +    }
  61. + 
  62. +    if (NumPrompts == 1)  {
  63. +      strcat(Option[0],": ");
  64. +      CURGetOneOption(CursesScreen, Option[0], Response[0]);
  65. +    } else {
  66. +      Get_Options(GSgetTitle(ZeGopher), sErrMsg,NumPrompts,Option,Response);
  67. +    }
  68. + 
  69. +    GSsetType(ZeGopher,ReturnType);
  70. + 
  71. +    for (i=0; i<NumPrompts; i++) {
  72. +        if (i>0 || return_selector[0]) strcat(return_selector,"\t");
  73. +        strcat(return_selector,Response[i]);
  74. +    }   
  75. + 
  76. +    GSsetPath(ZeGopher,return_selector);
  77. +    return;
  78. + 
  79. + }
  80. + 
  81. + 
  82.   /*
  83.   ** Open a connection to another host using telnet or tn3270
  84.   */
  85. ***************
  86. *** 675,681 ****
  87.        int iNum=0;
  88.        BOOLEAN bDone = FALSE;
  89.        char sTmp[80];
  90. !      GopherStruct *RootGopher;
  91.        int TypedChar;
  92.        /*** for getopt processing ***/
  93.        int c;
  94. --- 736,742 ----
  95.        int iNum=0;
  96.        BOOLEAN bDone = FALSE;
  97.        char sTmp[80];
  98. !      GopherStruct *RootGopher,*QueryGopher,*SelectedGopher;
  99.        int TypedChar;
  100.        /*** for getopt processing ***/
  101.        int c;
  102. ***************
  103. *** 685,690 ****
  104. --- 746,753 ----
  105.        int Garbled = TRUE;
  106.   
  107.        RootGopher = GSnew();
  108. +      QueryGopher = GSnew();
  109. + 
  110.        SavedLinenum[SavedLinePtr] = 1;
  111.   
  112.   
  113. ***************
  114. *** 774,785 ****
  115.         case '\n':
  116.              /*** Select the designated item ***/
  117.              iNum = iLine - 1;
  118. !            if (GSgetType(GDgetEntry(CurrentDir, iNum)) == A_DIRECTORY || 
  119. !            GSgetType(GDgetEntry(CurrentDir, iNum)) == A_INDEX) {
  120.               SavedLinenum[++SavedLinePtr] = iLine;
  121.               iLine=1;
  122.              }
  123. !            if (process_request(GDgetEntry(CurrentDir, iNum))==1)
  124.               iLine= iNum+1;
  125.              break;
  126.              
  127. --- 837,855 ----
  128.         case '\n':
  129.              /*** Select the designated item ***/
  130.              iNum = iLine - 1;
  131. !                if(GSgetType(GDgetEntry(CurrentDir, iNum)) == A_QUERY) {
  132. !                   do_query(GDgetEntry(CurrentDir,iNum),QueryGopher);
  133. !                   SelectedGopher = QueryGopher;
  134. !                } else {
  135. !                   SelectedGopher = GDgetEntry(CurrentDir,iNum);
  136. !                }
  137. ! 
  138. !            if (GSgetType(SelectedGopher) == A_DIRECTORY || 
  139. !            GSgetType(SelectedGopher) == A_INDEX) {
  140.               SavedLinenum[++SavedLinePtr] = iLine;
  141.               iLine=1;
  142.              }
  143. !            if (process_request(SelectedGopher)==1)
  144.               iLine= iNum+1;
  145.              break;
  146.              
  147. ***************
  148. *** 1159,1164 ****
  149. --- 1229,1237 ----
  150.         showfile(ZeGopher);
  151.         break;
  152.   
  153. +      case A_QUERY:
  154. +           do_query(ZeGopher);
  155. +           break;
  156.        case A_INDEX:
  157.         Draw_Status("Searching Text...");
  158.         refresh();
  159. diff -cr gopher1.01/gopher/manager.c gopher1.01.q/gopher/manager.c
  160. *** gopher1.01/gopher/manager.c    Wed Jun 10 23:03:43 1992
  161. --- gopher1.01.q/gopher/manager.c    Mon Jul 20 11:58:04 1992
  162. ***************
  163. *** 72,77 ****
  164. --- 72,78 ----
  165.     int nNewPage, nMaxPages, iPageLen, iLastPageLen;
  166.   {
  167.        int i, iLoop, iOffset;
  168. +      char ch,query;
  169.   
  170.        /*** Clear the screen and redraw the top line **/
  171.        clear();
  172. ***************
  173. *** 109,115 ****
  174.              printw(" %s", c);
  175.   
  176.        }
  177. !       switch(GSgetType(GDgetEntry(gopherdir,iOffset)))
  178.            {
  179.            case A_DIRECTORY:
  180.              addch('/');
  181. --- 110,125 ----
  182.              printw(" %s", c);
  183.   
  184.        }
  185. ! 
  186. !         ch=GSgetType(GDgetEntry(gopherdir,iOffset));
  187. !         if (ch==A_QUERY) {
  188. !            query=A_QUERY;
  189. !            ch= *GSgetPath(GDgetEntry(gopherdir,iOffset));
  190. !         } else {
  191. !            query='\0';
  192. !         }
  193. !                        
  194. !       switch(ch)
  195.            {
  196.            case A_DIRECTORY:
  197.              addch('/');
  198. ***************
  199. *** 123,128 ****
  200. --- 133,141 ----
  201.            case A_INDEX:
  202.              addstr(" <?>");
  203.              break;
  204. +          case A_QUERY:
  205. +            addstr(" <QUERY>");
  206. +            break;
  207.                case A_SOUND:
  208.              addstr(" <)");  /** It's supposed to look like a speaker! **/
  209.              break;
  210. ***************
  211. *** 138,144 ****
  212.              break;
  213.   
  214.                }
  215. !      }
  216.   }
  217.   
  218.   
  219. --- 151,158 ----
  220.              break;
  221.   
  222.                }
  223. !              if (query==A_QUERY) addstr(" [QUERY]");
  224. !     }
  225.   }
  226.   
  227.   
  228. Common subdirectories: gopher1.01/misc/Logging and gopher1.01.q/misc/Logging
  229. Common subdirectories: gopher1.01/misc/NeXT and gopher1.01.q/misc/NeXT
  230. Common subdirectories: gopher1.01/misc/Radio and gopher1.01.q/misc/Radio
  231. Common subdirectories: gopher1.01/misc/archie-gopher-gw and gopher1.01.q/misc/archie-gopher-gw
  232. Common subdirectories: gopher1.01/misc/go500 and gopher1.01.q/misc/go500
  233. Common subdirectories: gopher1.01/misc/gopher2ftp and gopher1.01.q/misc/gopher2ftp
  234. Common subdirectories: gopher1.01/misc/gopherdist and gopher1.01.q/misc/gopherdist
  235. Common subdirectories: gopher1.01/misc/gopherhunt and gopher1.01.q/misc/gopherhunt
  236. Common subdirectories: gopher1.01/misc/shell-utils and gopher1.01.q/misc/shell-utils
  237. Common subdirectories: gopher1.01/misc/waisgopher and gopher1.01.q/misc/waisgopher
  238. Common subdirectories: gopher1.01/misc/Radio/radio and gopher1.01.q/misc/Radio/radio
  239. Common subdirectories: gopher1.01/misc/Radio/radiod and gopher1.01.q/misc/Radio/radiod
  240. diff -cr gopher1.01/object/GSgopherobj.c gopher1.01.q/object/GSgopherobj.c
  241. *** gopher1.01/object/GSgopherobj.c    Thu Jun 11 17:20:22 1992
  242. --- gopher1.01.q/object/GSgopherobj.c    Mon Jul 20 11:56:26 1992
  243. ***************
  244. *** 222,227 ****
  245. --- 222,228 ----
  246.          case A_HTML:
  247.          case A_TN3270:
  248.          case A_MIME:
  249. +        case A_QUERY:
  250.   /*     case A_EVENT:
  251.          case A_CALENDAR:   not ready for prime time yet */
  252.         break;
  253. ***************
  254. *** 353,359 ****
  255.   #define    G_NAME    (1<<2)
  256.   #define    G_PORT    (1<<3)
  257.   #define    G_HOST    (1<<4)
  258. ! #define    G_ALL (G_PATH | G_TYPE | G_NAME | G_PORT | G_HOST)
  259.   
  260.   int
  261.   GSfromLink(gs, fd, host, port)
  262. --- 354,362 ----
  263.   #define    G_NAME    (1<<2)
  264.   #define    G_PORT    (1<<3)
  265.   #define    G_HOST    (1<<4)
  266. ! #define G_PROMPT      (1<<5)
  267. ! #define G_RETURNTYPE  (1<<6)
  268. ! #define    G_ALL (G_PATH | G_TYPE | G_NAME | G_PORT | G_HOST | G_PROMPT | G_RETURNTYPE)
  269.   
  270.   int
  271.   GSfromLink(gs, fd, host, port)
  272. ***************
  273. *** 364,370 ****
  274. --- 367,378 ----
  275.   {
  276.        int doneflags = 0;
  277.        char buf[1024];
  278. +      char Prompts[1024];
  279. +      char ReturnType;
  280. +      int NumPrompts=0;
  281.   
  282. +      Prompts[0]='\0';
  283. + 
  284.        while ((doneflags != G_ALL) && readline(fd, buf, 1024)) {
  285.         if (buf[0] == '#')
  286.              continue;   /* comment */
  287. ***************
  288. *** 374,381 ****
  289.         if (strncmp(buf, "Type=", 5)==0) {
  290.              GSsetType(gs, buf[5]);
  291.              doneflags |= G_TYPE;
  292.         }
  293. !       
  294.         if (strncmp(buf, "Name=", 5)==0) {
  295.              GSsetTitle(gs, buf+5);
  296.              doneflags |= G_NAME;
  297. --- 382,401 ----
  298.         if (strncmp(buf, "Type=", 5)==0) {
  299.              GSsetType(gs, buf[5]);
  300.              doneflags |= G_TYPE;
  301. +                if (buf[5]!=A_QUERY) doneflags |= (G_PROMPT | G_RETURNTYPE);
  302.         }
  303. !       if (strncmp(buf, "ReturnType=",11)==0) {
  304. !                ReturnType = buf[11];
  305. !                doneflags |= G_RETURNTYPE;
  306. !       }
  307. ! 
  308. !           if (strncmp(buf,"Prompt=",7)==0) {
  309. !                strcat(Prompts,"|");
  310. !                strcat(Prompts,buf+7);
  311. !                NumPrompts++;
  312. !                doneflags |= G_PROMPT;
  313. !           }
  314. !     
  315.         if (strncmp(buf, "Name=", 5)==0) {
  316.              GSsetTitle(gs, buf+5);
  317.              doneflags |= G_NAME;
  318. ***************
  319. *** 406,411 ****
  320. --- 426,443 ----
  321.              GSsetNum(gs, atoi(buf+5));
  322.         
  323.        }
  324. + 
  325. +      if (doneflags==G_ALL && GSgetType(gs)==A_QUERY) { /*patch selector */
  326. +        char buffer[1024];
  327. +        sprintf(buffer,"%c|%d",ReturnType,NumPrompts);
  328. +        if (NumPrompts) strcat(buffer,Prompts);
  329. +        if (strcmp(GSgetPath(gs),"")) {
  330. +            strcat(buffer,"|");
  331. +            strcat(buffer,GSgetPath(gs));
  332. +      }
  333. +        GSsetPath(gs,buffer);
  334. +      }
  335. + 
  336.        return ((doneflags == G_ALL) ? 0 : -1); /* 0 == success */
  337.   }
  338.   
  339. diff -cr gopher1.01/object/GSgopherobj.h gopher1.01.q/object/GSgopherobj.h
  340. *** gopher1.01/object/GSgopherobj.h    Thu Jun 11 17:20:09 1992
  341. --- gopher1.01.q/object/GSgopherobj.h    Mon Jul 20 11:56:24 1992
  342. ***************
  343. *** 19,25 ****
  344.   #define A_TN3270    'T'
  345.   #define A_MIME      'M'
  346.   #define A_EOI        '.'
  347. ! 
  348.   
  349.   /** Our Gopher Object Type **/
  350.   
  351. --- 19,25 ----
  352.   #define A_TN3270    'T'
  353.   #define A_MIME      'M'
  354.   #define A_EOI        '.'
  355. ! #define A_QUERY     'q'
  356.   
  357.   /** Our Gopher Object Type **/
  358.   
  359.